A little bit of microoptimization of repeated GDK_GC_XDISPLAY()/XGC().

Tue Nov 23 19:37:34 2004  Owen Taylor  <otaylor@redhat.com>

        * gdk/x11/gdkgc-x11.c (_gdk_x11_gc_flush): A little bit
        of microoptimization of repeated GDK_GC_XDISPLAY()/XGC().

diff --git a/ChangeLog b/ChangeLog
index 21988d9a2b786ff02f5d5d31d3633035aa655424..dfd25339743edbdb8e9f48ec16c83e2ed1feb5d5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Nov 23 19:37:34 2004  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkgc-x11.c (_gdk_x11_gc_flush): A little bit
+       of microoptimization of repeated GDK_GC_XDISPLAY()/XGC().
+
 2004-11-30  Matthias Clasen  <mclasen@redhat.com>
 
        * NEWS: Updates.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 21988d9a2b786ff02f5d5d31d3633035aa655424..dfd25339743edbdb8e9f48ec16c83e2ed1feb5d5 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Tue Nov 23 19:37:34 2004  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkgc-x11.c (_gdk_x11_gc_flush): A little bit
+       of microoptimization of repeated GDK_GC_XDISPLAY()/XGC().
+
 2004-11-30  Matthias Clasen  <mclasen@redhat.com>
 
        * NEWS: Updates.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 21988d9a2b786ff02f5d5d31d3633035aa655424..dfd25339743edbdb8e9f48ec16c83e2ed1feb5d5 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Tue Nov 23 19:37:34 2004  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkgc-x11.c (_gdk_x11_gc_flush): A little bit
+       of microoptimization of repeated GDK_GC_XDISPLAY()/XGC().
+
 2004-11-30  Matthias Clasen  <mclasen@redhat.com>
 
        * NEWS: Updates.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 21988d9a2b786ff02f5d5d31d3633035aa655424..dfd25339743edbdb8e9f48ec16c83e2ed1feb5d5 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Tue Nov 23 19:37:34 2004  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkgc-x11.c (_gdk_x11_gc_flush): A little bit
+       of microoptimization of repeated GDK_GC_XDISPLAY()/XGC().
+
 2004-11-30  Matthias Clasen  <mclasen@redhat.com>
 
        * NEWS: Updates.

diff --git a/gdk/x11/gdkgc-x11.c b/gdk/x11/gdkgc-x11.c
index 391c3deec1ee953152afad131a1fdc1c002e2297..f6e4e51a89ece7d4d6630cca24d89be9aaa29e85 100644 (file)
--- a/gdk/x11/gdkgc-x11.c
+++ b/gdk/x11/gdkgc-x11.c
@@ -208,12 +208,14 @@ _gdk_x11_gc_new (GdkDrawable      *drawable,
 GC
 _gdk_x11_gc_flush (GdkGC *gc)
 {
+  Display *xdisplay = GDK_GC_XDISPLAY (gc);
   GdkGCX11 *private = GDK_GC_X11 (gc);
+  GC xgc = private->xgc;
 
   if (private->dirty_mask & GDK_GC_DIRTY_CLIP)
     {
       if (!private->clip_region)
-       XSetClipOrigin (GDK_GC_XDISPLAY (gc), GDK_GC_XGC (gc),
+       XSetClipOrigin (xdisplay, xgc,
                        gc->clip_x_origin, gc->clip_y_origin);
       else
        {
@@ -226,7 +228,7 @@ _gdk_x11_gc_flush (GdkGC *gc)
                                        &rectangles,
                                        &n_rects);
          
-         XSetClipRectangles (GDK_GC_XDISPLAY (gc), GDK_GC_XGC (gc), 0, 0,
+         XSetClipRectangles (xdisplay, xgc, 0, 0,
                               rectangles,
                               n_rects, YXBanded);
           
@@ -236,12 +238,12 @@ _gdk_x11_gc_flush (GdkGC *gc)
 
   if (private->dirty_mask & GDK_GC_DIRTY_TS)
     {
-      XSetTSOrigin (GDK_GC_XDISPLAY (gc), GDK_GC_XGC (gc),
+      XSetTSOrigin (xdisplay, xgc,
                    gc->ts_x_origin, gc->ts_y_origin);
     }
 
   private->dirty_mask = 0;
-  return GDK_GC_XGC (gc);
+  return xgc;
 }
 
 static void